Don't use `.cargo` for custom CARGO_HOME

Users changing cargo's home directory expect it to be used as top path
instead of there being a `.cargo` hidden dir in it. There are some cases
following this pattern one of them is python's virtualenvwrapper, which
uses `WORK_HOME` as a home dir for everything.

This patch removes the extra `.cargo` and assumes that CARGO_HOME is the
real path a user wants to use as a homedir for cargo.

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 885f4b1765367ac502b1fb6331abce94948f0d38..a1fffd9abb57ca113c587f9f781a4fdefb812604 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -52,23 +52,23 @@ impl<'a> Config<'a> {
     pub fn home(&self) -> &Path { &self.home_path }
 
     pub fn git_db_path(&self) -> Path {
-        self.home_path.join(".cargo").join("git").join("db")
+        self.home_path.join("git").join("db")
     }
 
     pub fn git_checkout_path(&self) -> Path {
-        self.home_path.join(".cargo").join("git").join("checkouts")
+        self.home_path.join("git").join("checkouts")
     }
 
     pub fn registry_index_path(&self) -> Path {
-        self.home_path.join(".cargo").join("registry").join("index")
+        self.home_path.join("registry").join("index")
     }
 
     pub fn registry_cache_path(&self) -> Path {
-        self.home_path.join(".cargo").join("registry").join("cache")
+        self.home_path.join("registry").join("cache")
     }
 
     pub fn registry_source_path(&self) -> Path {
-        self.home_path.join(".cargo").join("registry").join("src")
+        self.home_path.join("registry").join("src")
     }
 
     pub fn shell(&self) -> RefMut<&'a mut MultiShell> {
@@ -251,7 +251,7 @@ impl ConfigValue {
 
 fn homedir() -> Option<Path> {
     let cargo_home = os::getenv("CARGO_HOME").map(|p| Path::new(p));
-    let user_home = os::homedir();
+    let user_home = os::homedir().map(|p| p.join(".cargo"));
     return cargo_home.or(user_home);
 }
 
@@ -325,7 +325,7 @@ fn walk_tree(pwd: &Path,
               This probably means that $HOME was not set.")
     }));
     if !home.is_ancestor_of(pwd) {
-        let config = home.join(".cargo/config");
+        let config = home.join("config");
         if config.exists() {
             let file = try!(File::open(&config));
             try!(walk(file));
@@ -351,7 +351,7 @@ pub fn set_config(cfg: &Config, loc: Location, key: &str,
     // 2. This blows away all comments in a file
     // 3. This blows away the previous ordering of a file.
     let file = match loc {
-        Location::Global => cfg.home_path.join(".cargo").join("config"),
+        Location::Global => cfg.home_path.join("config"),
         Location::Project => unimplemented!(),
     };
     try!(fs::mkdir_recursive(&file.dir_path(), io::USER_DIR));

diff --git a/tests/test_cargo.rs b/tests/test_cargo.rs
index 1456ea5810a9b912fe6c991ef713012592e98773..759a1fb1ade6cf0ba5085831eb2a3892e88c37ca 100644 (file)
--- a/tests/test_cargo.rs
+++ b/tests/test_cargo.rs
@@ -79,8 +79,7 @@ test!(override_cargo_home {
     let root = paths::root();
     let my_home = root.join("my_home");
     fs::mkdir(&my_home, USER_RWX).unwrap();
-    fs::mkdir(&my_home.join(".cargo"), USER_RWX).unwrap();
-    File::create(&my_home.join(".cargo/config")).write_str(r#"
+    File::create(&my_home.join("config")).write_str(r#"
         [cargo-new]
         name = "foo"
         email = "bar"